Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 02:07:55 +0000 (18:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 02:07:55 +0000 (18:07 -0800)
commite66299ddd77c5871827626cd257e16fef37f4156
tree763a68dce62a0e449f3d238b99a48aa988ae6eaf
parenta2750d9845c0bffc0855288fdcc01517bc1307f3
parent1291776c746634ea90f8ef3e8d05f26056d45f95
Merge from mainline.